From 54ec6e3d26aa4cbda45acaa59d27fa188a60e5b5 Mon Sep 17 00:00:00 2001 From: "chris@kneesaa.uk.xensource.com" Date: Wed, 9 Aug 2006 20:07:01 +0100 Subject: [PATCH] [qemu] HVM acpi port init update. Removed the acpi port depency on USB exist. Based on a patch from: Winston Wang Signed-off-by: Christian Limpach --- tools/ioemu/hw/pc.c | 8 ++++---- tools/ioemu/hw/piix4acpi.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/ioemu/hw/pc.c b/tools/ioemu/hw/pc.c index 7dd1f75203..70cf09064f 100644 --- a/tools/ioemu/hw/pc.c +++ b/tools/ioemu/hw/pc.c @@ -877,14 +877,14 @@ static void pc_init1(uint64_t ram_size, int vga_ram_size, int boot_device, cmos_init(ram_size, boot_device, bs_table, timeoffset); - /* using PIIX4 acpi model */ - if (pci_enabled && acpi_enabled) - pci_piix4_acpi_init(pci_bus, piix3_devfn + 3); - if (pci_enabled && usb_enabled) { usb_uhci_init(pci_bus, piix3_devfn + 2); } + /* using PIIX4 acpi model */ + if (pci_enabled && acpi_enabled) + pci_piix4_acpi_init(pci_bus, piix3_devfn + (usb_enabled ? 3 : 2)); + #ifndef CONFIG_DM if (pci_enabled && acpi_enabled) { piix4_pm_init(pci_bus, piix3_devfn + 3); diff --git a/tools/ioemu/hw/piix4acpi.c b/tools/ioemu/hw/piix4acpi.c index 2f4bdf61d5..1426447f9b 100644 --- a/tools/ioemu/hw/piix4acpi.c +++ b/tools/ioemu/hw/piix4acpi.c @@ -380,7 +380,7 @@ void pci_piix4_acpi_init(PCIBus *bus, int devfn) PCIAcpiState *d; uint8_t *pci_conf; - /* register a function 3 of PIIX4 */ + /* register a function devfn of PIIX4 */ d = (PCIAcpiState *)pci_register_device( bus, "PIIX4 ACPI", sizeof(PCIAcpiState), devfn, NULL, NULL); -- 2.30.2